//
//  ViewController.m
//  testDemo
//
//  Created by 刘婷 on 17/1/8.
//  Copyright © 2017年 刘婷. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    [self test];
    self.title = @"feature1.0";
    // Do any additional setup after loading the view, typically from a nib.
}


- (void)test{
    self.title = @"master上的开发";
}
- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
{
    self.view.backgroundColor = [UIColor colorWithRed:arc4random_uniform(255.0)/255.0 green:arc4random_uniform(255.0)/255.0 blue:arc4random_uniform(255.0)/255.0 alpha:1];
}
- (void)testDemo{
    NSLog(@"在feature1.上开发");
}

- (void)testDemo1{
    NSLog(@"在master上的开发");
}

- (void)testDemo2{
    NSLog(@"在master上的第三次开发");
}


- (void)testDemo6{
    NSLog(@"在master上的打标签");
}
- (void)testDemo3{
    NSLog(@"在feature上的第三次开发");
    NSLog(@"我想将master上的内容合并到feature上");
}

- (void)testDemo4{
    NSLog(@"使用终端命令操作git");

}

@end
